Skip to content

OCPBUGS-52923: Synchronize From Upstream Repositories (with a revert) PR 988 with revert #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 22, 2025

Conversation

tmshort
Copy link
Contributor

@tmshort tmshort commented Apr 21, 2025

This is equivalent to PR #988 with revert of 0a6499f53b135ef0605b3fe260207936eda3cb8c

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-03-21 12:50:04 operator-framework/operator-lifecycle-manager@8e39ae2 dependabot[bot] 🌱 Bump the k8s-dependencies group with 8 updates (#3541)
2025-03-21 12:50:08 operator-framework/operator-lifecycle-manager@6056602 dependabot[bot] 🌱 Bump golang.org/x/time from 0.10.0 to 0.11.0 (#3540)
2025-03-25 19:09:00 operator-framework/operator-lifecycle-manager@0a6499f Mikalai Radchuk Add tests for package migration/renaming (#3547) (reverted)
2025-03-26 10:03:50 operator-framework/operator-lifecycle-manager@4de2797 dependabot[bot] 🌱 Bump sigs.k8s.io/controller-runtime (#3544)
2025-03-29 14:41:26 operator-framework/operator-lifecycle-manager@98b975a dependabot[bot] 🌱 Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.3 (#3545)
2025-04-04 07:18:34 operator-framework/operator-lifecycle-manager@dfd0b2b Anik CVE-2025-27144: pin go-jose/[email protected] (#3550)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

dependabot bot and others added 7 commits April 5, 2025 00:02
Bumps the k8s-dependencies group with 8 updates:

| Package | From | To |
| --- | --- | --- |
| [k8s.io/api](https://github.com/kubernetes/api) | `0.32.2` | `0.32.3` |
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.32.2` | `0.32.3` |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.32.2` | `0.32.3` |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.32.2` | `0.32.3` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.32.2` | `0.32.3` |
| [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.32.2` | `0.32.3` |
| [k8s.io/component-base](https://github.com/kubernetes/component-base) | `0.32.2` | `0.32.3` |
| [k8s.io/kube-aggregator](https://github.com/kubernetes/kube-aggregator) | `0.32.2` | `0.32.3` |

Updates `k8s.io/api` from 0.32.2 to 0.32.3
- [Commits](kubernetes/api@v0.32.2...v0.32.3)

Updates `k8s.io/apiextensions-apiserver` from 0.32.2 to 0.32.3
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.32.2...v0.32.3)

Updates `k8s.io/apimachinery` from 0.32.2 to 0.32.3
- [Commits](kubernetes/apimachinery@v0.32.2...v0.32.3)

Updates `k8s.io/apiserver` from 0.32.2 to 0.32.3
- [Commits](kubernetes/apiserver@v0.32.2...v0.32.3)

Updates `k8s.io/client-go` from 0.32.2 to 0.32.3
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.32.2...v0.32.3)

Updates `k8s.io/code-generator` from 0.32.2 to 0.32.3
- [Commits](kubernetes/code-generator@v0.32.2...v0.32.3)

Updates `k8s.io/component-base` from 0.32.2 to 0.32.3
- [Commits](kubernetes/component-base@v0.32.2...v0.32.3)

Updates `k8s.io/kube-aggregator` from 0.32.2 to 0.32.3
- [Commits](kubernetes/kube-aggregator@v0.32.2...v0.32.3)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/code-generator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
- dependency-name: k8s.io/kube-aggregator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8e39ae2096e9aaff34acdf992e6978296e4c6384
Bumps [golang.org/x/time](https://github.com/golang/time) from 0.10.0 to 0.11.0.
- [Commits](golang/time@v0.10.0...v0.11.0)

---
updated-dependencies:
- dependency-name: golang.org/x/time
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 6056602239a2c893f5dc2f9e0176652b71506cc6
Tests upgrades from one package to another within the same subscription.
This is useful when renaming operator package.

No new features introduced: this is currently supported by OLM,
but there are no tests for this.

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 0a6499f53b135ef0605b3fe260207936eda3cb8c
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).

Updates `sigs.k8s.io/controller-runtime` from 0.20.3 to 0.20.4
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.20.3...v0.20.4)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4de27972108aead2917ade6aaf1fbb2739503acd
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.23.0 to 2.23.3.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.23.0...v2.23.3)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 98b975af3a0a9b739adbe671aec6cb79f0dc1b3d
Upstream-repository: operator-lifecycle-manager
Upstream-commit: dfd0b2bea85038d3c0d65348bc812d297f16b8d2
This reverts commit 0a6499f53b135ef0605b3fe260207936eda3cb8c.
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 21, 2025
@openshift-ci-robot
Copy link

@tmshort: This pull request explicitly references no jira issue.

In response to this:

This is equivalent to PR 988 with revert of 0a6499f53b135ef0605b3fe260207936eda3cb8c

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-03-21 12:50:04 operator-framework/operator-lifecycle-manager@8e39ae2 dependabot[bot] 🌱 Bump the k8s-dependencies group with 8 updates (#3541)
2025-03-21 12:50:08 operator-framework/operator-lifecycle-manager@6056602 dependabot[bot] 🌱 Bump golang.org/x/time from 0.10.0 to 0.11.0 (#3540)
2025-03-25 19:09:00 operator-framework/operator-lifecycle-manager@0a6499f Mikalai Radchuk Add tests for package migration/renaming (#3547) (reverted)
2025-03-26 10:03:50 operator-framework/operator-lifecycle-manager@4de2797 dependabot[bot] 🌱 Bump sigs.k8s.io/controller-runtime (#3544)
2025-03-29 14:41:26 operator-framework/operator-lifecycle-manager@98b975a dependabot[bot] 🌱 Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.3 (#3545)
2025-04-04 07:18:34 operator-framework/operator-lifecycle-manager@dfd0b2b Anik CVE-2025-27144: pin go-jose/[email protected] (#3550)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 21, 2025
Copy link
Contributor

@anik120 anik120 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Thank you!

Additional context: #988 is failing openshift-e2e-gcp consistently because of operator-framework/operator-lifecycle-manager#3547. That commit needs to be investigated once CI issues subside and an openshift cluster is available for debugging.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2025
Copy link
Contributor

openshift-ci bot commented Apr 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 84b340e and 2 for PR HEAD 0126f68 in total

@anik120
Copy link
Contributor

anik120 commented Apr 21, 2025

/retest-required

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 84b340e and 2 for PR HEAD 0126f68 in total

Copy link
Contributor

openshift-ci bot commented Apr 22, 2025

@tmshort: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 0126f68 link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@anik120
Copy link
Contributor

anik120 commented Apr 22, 2025

/test e2e-upgrade

@anik120
Copy link
Contributor

anik120 commented Apr 22, 2025

/retitle OCPBUGS-52923: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title NO-ISSUE: Sync from upstream repositories (with a revert) PR 988 with revert OCPBUGS-52923: Synchronize From Upstream Repositories Apr 22, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 22, 2025
@anik120
Copy link
Contributor

anik120 commented Apr 22, 2025

/retitle OCPBUGS-52923: Synchronize From Upstream Repositories (with a revert) PR 988 with revert

@openshift-ci-robot
Copy link

@tmshort: This pull request references Jira Issue OCPBUGS-52923, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is equivalent to PR #988 with revert of 0a6499f53b135ef0605b3fe260207936eda3cb8c

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-03-21 12:50:04 operator-framework/operator-lifecycle-manager@8e39ae2 dependabot[bot] 🌱 Bump the k8s-dependencies group with 8 updates (#3541)
2025-03-21 12:50:08 operator-framework/operator-lifecycle-manager@6056602 dependabot[bot] 🌱 Bump golang.org/x/time from 0.10.0 to 0.11.0 (#3540)
2025-03-25 19:09:00 operator-framework/operator-lifecycle-manager@0a6499f Mikalai Radchuk Add tests for package migration/renaming (#3547) (reverted)
2025-03-26 10:03:50 operator-framework/operator-lifecycle-manager@4de2797 dependabot[bot] 🌱 Bump sigs.k8s.io/controller-runtime (#3544)
2025-03-29 14:41:26 operator-framework/operator-lifecycle-manager@98b975a dependabot[bot] 🌱 Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.3 (#3545)
2025-04-04 07:18:34 operator-framework/operator-lifecycle-manager@dfd0b2b Anik CVE-2025-27144: pin go-jose/[email protected] (#3550)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title OCPBUGS-52923: Synchronize From Upstream Repositories OCPBUGS-52923: Synchronize From Upstream Repositories (with a revert) PR 988 with revert Apr 22, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 3eee029 into openshift:main Apr 22, 2025
14 of 15 checks passed
@openshift-ci-robot
Copy link

@tmshort: Jira Issue OCPBUGS-52923: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-52923 has not been moved to the MODIFIED state.

In response to this:

This is equivalent to PR #988 with revert of 0a6499f53b135ef0605b3fe260207936eda3cb8c

The staging/ and vendor/ directories have been synchronized from the upstream repositories, pulling in the following commits:

Date Commit Author Message
2025-03-21 12:50:04 operator-framework/operator-lifecycle-manager@8e39ae2 dependabot[bot] 🌱 Bump the k8s-dependencies group with 8 updates (#3541)
2025-03-21 12:50:08 operator-framework/operator-lifecycle-manager@6056602 dependabot[bot] 🌱 Bump golang.org/x/time from 0.10.0 to 0.11.0 (#3540)
2025-03-25 19:09:00 operator-framework/operator-lifecycle-manager@0a6499f Mikalai Radchuk Add tests for package migration/renaming (#3547) (reverted)
2025-03-26 10:03:50 operator-framework/operator-lifecycle-manager@4de2797 dependabot[bot] 🌱 Bump sigs.k8s.io/controller-runtime (#3544)
2025-03-29 14:41:26 operator-framework/operator-lifecycle-manager@98b975a dependabot[bot] 🌱 Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.3 (#3545)
2025-04-04 07:18:34 operator-framework/operator-lifecycle-manager@dfd0b2b Anik CVE-2025-27144: pin go-jose/[email protected] (#3550)

This pull request is expected to merge without any human intervention. If tests are failing here, changes must land upstream to fix any issues so that future downstreaming efforts succeed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-registry
This PR has been included in build operator-registry-container-v4.20.0-202504221841.p0.g3eee029.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: operator-lifecycle-manager
This PR has been included in build operator-lifecycle-manager-container-v4.20.0-202504221841.p0.g3eee029.assembly.stream.el9.
All builds following this will include this PR.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-operator-framework-tools
This PR has been included in build ose-operator-framework-tools-container-v4.20.0-202504221841.p0.g3eee029.assembly.stream.el9.
All builds following this will include this PR.

@anik120
Copy link
Contributor

anik120 commented Apr 23, 2025

/jira refresh

@openshift-ci-robot
Copy link

@anik120: Jira Issue OCPBUGS-52923: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-52923 has been moved to the MODIFIED state.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants